utils/pypi: ignore test resources when counting matches #16790
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Michael Cho <michael@michaelcho.dev>
1 task
MikeMcQuaid
reviewed
Mar 4, 2024
| @@ -358,7 +358,7 @@ def self.update_python_resources!(formula, version: nil, package_name: nil, extr | |||
|
|
|||
| ohai "Updating resource blocks" unless silent | |||
| Utils::Inreplace.inreplace formula.path do |s| | |||
| if s.inreplace_string.scan(inreplace_regex).length > 1 | |||
| if T.must(s.inreplace_string.split(/^ test do\b/, 2).first).scan(inreplace_regex).length > 1 | |||
There was a problem hiding this comment.
Is it genuinely impossible that the T.must won't be truthy here?
There was a problem hiding this comment.
The only way I can think of is if the Formula file is entirely blank. In this case, s.inreplace_string == "" and that will lead to nil:
❯ brew ruby -e 'p "".split(/^ test do\b/, 2).first'
nilIf the file doesn't exist, brew fails earlier due to File.binread. If the file has at least a single character then it will return a String:
❯ brew ruby -e 'p " ".split(/^ test do\b/, 2).first'
" "I didn't think that would happen, but if there is an odd situation which allows for it then I can change check to something safer, e.g.
Suggested change
| if T.must(s.inreplace_string.split(/^ test do\b/, 2).first).scan(inreplace_regex).length > 1 | |
| formula_contents_without_test = s.inreplace_string.split(/^ test do\b/, 2).first | |
| if formula_contents_without_test.nil? || formula_contents_without_test.scan(inreplace_regex).length > 1 |
Suggested change
| if T.must(s.inreplace_string.split(/^ test do\b/, 2).first).scan(inreplace_regex).length > 1 | |
| if s.inreplace_string.split(/^ test do\b/, 2).first&.scan(inreplace_regex)&.length.to_i > 1 |
MikeMcQuaid
approved these changes
Mar 4, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
brew stylewith your changes locally?brew typecheckwith your changes locally?brew testswith your changes locally?Simple way to ignore resources inside test block when counting matches. We later use
s.sub!which should only modify the first match..splitshould return at least 1 string in an array as long ass.inreplace_stringis not the empty string.At least handles main issue in #16704 but we may still want to document and improve handling of test resources.